From b5fd9df4a3e8c99f52e3ec843eee451d4689bb02 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Wed, 2 Nov 2005 11:45:37 +0000 Subject: [PATCH] OcamlABI'fied the remaining 3.09.0 containing files. --- .../ocaml-md5sums/{configure => configure.in} | 2 +- ...bdir.dpatch => versioned_libdir.dpatch.in} | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) rename debian/ocaml-md5sums/{configure => configure.in} (88%) rename debian/patches/{versioned_libdir.dpatch => versioned_libdir.dpatch.in} (66%) diff --git a/debian/ocaml-md5sums/configure b/debian/ocaml-md5sums/configure.in similarity index 88% rename from debian/ocaml-md5sums/configure rename to debian/ocaml-md5sums/configure.in index 10a6930b..addfa605 100644 --- a/debian/ocaml-md5sums/configure +++ b/debian/ocaml-md5sums/configure.in @@ -1,5 +1,5 @@ #!/bin/sh -DEFAULT="/var/lib/ocaml/3.09.0/md5sums" +DEFAULT="/var/lib/ocaml/#OcamlABI#/md5sums" if [ -z "$1" ]; then echo "No dir provided, using default: $DEFAULT" echo "You can override it with: ./configure [ md5sums_dir ]" diff --git a/debian/patches/versioned_libdir.dpatch b/debian/patches/versioned_libdir.dpatch.in similarity index 66% rename from debian/patches/versioned_libdir.dpatch rename to debian/patches/versioned_libdir.dpatch.in index 922e053f..2b45c5ac 100755 --- a/debian/patches/versioned_libdir.dpatch +++ b/debian/patches/versioned_libdir.dpatch.in @@ -18,17 +18,17 @@ esac exit 0 @DPATCH@ -diff -ur ocaml-3.08.orig/camlp4/config/configure_batch ocaml-3.08/camlp4/config/configure_batch ---- ocaml-3.08.orig/camlp4/config/configure_batch.orig 2003-09-30 18:11:57.000000000 +0200 -+++ ocaml-3.08/camlp4/config/configure_batch 2003-09-30 18:12:51.000000000 +0200 +diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_batch +--- ocaml.orig/camlp4/config/configure_batch.orig 2003-09-30 18:11:57.000000000 +0200 ++++ ocaml/camlp4/config/configure_batch 2003-09-30 18:12:51.000000000 +0200 @@ -94,13 +94,13 @@ *) echo "BINDIR=$bindir" >> Makefile.cnf;; esac case "$libdir" in - "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf - libdir="$prefix/lib/camlp4";; -+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0/camlp4' >> Makefile.cnf -+ libdir="$prefix/lib/ocaml/3.09.0/camlp4";; ++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#/camlp4' >> Makefile.cnf ++ libdir="$prefix/lib/ocaml/#OcamlABI#/camlp4";; *) echo "LIBDIR=$libdir" >> Makefile.cnf;; esac case "$mandir" in @@ -39,17 +39,17 @@ diff -ur ocaml-3.08.orig/camlp4/config/configure_batch ocaml-3.08/camlp4/config/ *) echo "MANDIR=$mandir" >> Makefile.cnf;; esac -diff -ur ocaml-3.08.orig/configure ocaml-3.08/configure ---- ocaml-3.08.orig/configure 2003-09-30 18:09:47.000000000 +0200 -+++ ocaml-3.08/configure 2003-09-30 18:10:12.000000000 +0200 +diff -ur ocaml.orig/configure ocaml/configure +--- ocaml.orig/configure 2003-09-30 18:09:47.000000000 +0200 ++++ ocaml/configure 2003-09-30 18:10:12.000000000 +0200 @@ -149,8 +149,8 @@ *) echo "BINDIR=$bindir" >> Makefile;; esac case "$libdir" in - "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile - libdir="$prefix/lib/ocaml";; -+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0' >> Makefile -+ libdir="$prefix/lib/ocaml/3.09.0";; ++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#' >> Makefile ++ libdir="$prefix/lib/ocaml/#OcamlABI#";; *) echo "LIBDIR=$libdir" >> Makefile;; esac echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile -- 2.30.2